From: Jonas Dreßler <verdre@v0yd.nl>
Date: Thu, 15 Apr 2021 14:58:17 +0000 (+0200)
Subject: overview: Sync grabs after running startup animation
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~19
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=954131c1c8a58a87d597270f357b0d0c7556662c;p=gnome-shell.git

overview: Sync grabs after running startup animation

In the nested session the startup animation sometimes fails, weirdly
that always happens to me when running a freshly built gnome-shell the
first time. The reason it fails is that mutter fails to aquire a pointer
grab from the xserver, XIGrabDevice() is unsuccessful.

A simple workaround for this race condition in the xserver is to just
grab the devices a bit later, that is after the startups animation
instead of before it.

This was also tested with disabled animations, and seems to work just as
well in that case.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1812>
---

diff --git a/js/ui/overview.js b/js/ui/overview.js
index ca5de0c22..e6b3b2615 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -649,13 +649,20 @@ var Overview = class {
         this._visible = true;
         this._visibleTarget = true;
         Main.layoutManager.showOverview();
-        this._syncGrab();
+        // We should call this._syncGrab() here, but moved it to happen after
+        // the animation because of a race in the xserver where the grab
+        // fails when requested very early during startup.
 
         Meta.disable_unredirect_for_display(global.display);
 
         this.emit('showing');
 
         this._overview.runStartupAnimation(() => {
+            if (!this._syncGrab()) {
+                callback();
+                return;
+            }
+
             Main.panel.style = null;
             this.emit('shown');
             callback();